This commit #refs 67538 (merge gmtb/develop into NOAA-EMC/develop) by climbfuji · Pull Request #7 · NOAA-EMC/NEMS

climbfuji · 2019-09-09T03:02:48Z

This commit #refs 67538, squashed commit of the following:

commit abe9efb
Author: Dom Heinzeller dom.heinzeller@noaa.gov
Date: Tue Sep 3 16:25:12 2019 -0600

src/module_MEDIATOR.F90: fix invalid Fortran code for GNU compiler

commit 89ddf13
Author: Dom Heinzeller dom.heinzeller@noaa.gov
Date: Wed Aug 28 13:36:52 2019 -0600

src/incmake/env/rdhpcs/detect.mk: bugfix for NEMSCompsetRun

commit 283eeb1
Merge: 1c71222 e142f4e
Author: Dom Heinzeller dom.heinzeller@icloud.com
Date: Tue Aug 27 15:45:57 2019 -0600

Merge pull request #2 from climbfuji/hera_update_20190827

gmtb/develop: update hera config

commit e142f4e
Author: Dom Heinzeller dom.heinzeller@noaa.gov
Date: Tue Aug 27 15:04:16 2019 -0600

src/incmake/env/rdhpcs/detect.mk: test for hostname prefix, since hera and theia both have /scratch1 through /scratch4 mounted

commit 028e1e8
Author: Dom Heinzeller dom.heinzeller@noaa.gov
Date: Tue Aug 27 13:45:29 2019 -0600

Update src/incmake/env/rdhpcs/detect.mk, src/conf/module-setup.csh.inc, src/conf/module-setup.sh.inc after move from Juno test system to Hera. Since /scratch4 from theia is also mounted on hera, need to switch the order of detection.

commit 1c71222
Merge: 6bf8109 5b244ab
Author: Dom Heinzeller dom.heinzeller@icloud.com
Date: Sat Aug 17 16:25:57 2019 -0600

Merge pull request #1 from climbfuji/hera_support

Add support for hera/juno (theia successor)

commit 5b244ab
Author: Dom Heinzeller dom.heinzeller@noaa.gov
Date: Fri Aug 16 09:33:34 2019 -0600

Add support for hera/juno (theia successor)

climbfuji · 2019-09-09T03:37:36Z

Associated pull requests (GitHub) or code review changes (Vlab/Gerrit):

NEMSfv3gfs: https://vlab.ncep.noaa.gov/code-review/19568 (including update of submodule pointer for WW3)
FV3: https://vlab.ncep.noaa.gov/code-review/19567
FV3/atmos_cubed_sphere: NOAA-EMC/GFDL_atmos_cubed_sphere#3
NEMS: #7 (ignore update of submodule pointer for pyprodutil)
WW3: no changes
FMS: no changes
ccpp-physics NCAR/ccpp-physics#317
ccpp-framework NCAR/ccpp-framework#222

RatkoVasic-NOAA

Hey Dom,
in two files (src/conf/module-setup.csh.inc and src/conf/module-setup.sh.inc) search criteria for hera and theia should be changed (yes, I'm aware in three weeks we will not have Theia anymore). For now, only difference between Theia and Hera are:
Theia have: /scratch /scratch1 /scratch2 /scratch3 /scratch4
and
Hera: /scratch1 /scratch2 /scratch3 /scratch4
My suggestion is to check which machine you're on like this this:
Hera: (if -d /scratch1 and .not. -d /scratch)
Theia: (if -d /scratch3 and -d /scratch)
-Ratko

climbfuji · 2019-09-09T15:31:45Z

Sure - do we need those two scripts at all? You didn't make any changes in them, and my versions apparently don't mess up the testing either. Anyway, I think this is the correct syntax? Can you check?

module-setup.sh.inc

if [[ -d /lfs3 ]] ; then
    # We are on NOAA Jet
    if ( ! eval module help > /dev/null 2>&1 ) ; then
        source /apps/lmod/lmod/init/$__ms_shell
    fi
    module purge
elif [[ -d /scratch1 && ! -d /scratch ]] ; then
    # We are on NOAA Hera
    if ( ! eval module help > /dev/null 2>&1 ) ; then
        source /apps/lmod/lmod/init/$__ms_shell
    fi
    module purge
elif [[ -d /scratch3 && -d /scratch ]] ; then
    # We are on NOAA Theia
    if ( ! eval module help > /dev/null 2>&1 ) ; then
        source /apps/lmod/lmod/init/$__ms_shell
    fi
    module purge
...

module-setup.csh.inc

if ( { test -d /lfs3 } ) then 
    # We are on NOAA Jet
    if ( ! { module help >& /dev/null } ) then
            source /apps/lmod/lmod/init/$__ms_shell
    endif
    module purge
else if ( { test -d /scratch1 -a ! -d /scratch } ) then
    # We are on NOAA Hera
    if ( ! { module help >& /dev/null } ) then
        source /apps/lmod/lmod/init/$__ms_shell
    endif
    module purge
else if ( { test -d /scratch3 -a -d /scratch } ) then
    # We are on NOAA Theia
    if ( ! { module help >& /dev/null } ) then
        source /apps/lmod/lmod/init/$__ms_shell
    endif
    module purge

RatkoVasic-NOAA · 2019-09-09T15:39:58Z

You are right, we don't need to change anything... they are both sourcing same filename at same location. Anyway I'm pretty sure your syntax is correct :-) So, your choice.. either use this new syntax, or leave files as they are (eventually changing comment from Theia to Hera). I vote for first option. -Ratko On 9/9/2019 11:31 AM, Dom Heinzeller wrote: Sure - do we need those two scripts at all? You didn't make any changes in them, and my versions apparently don't mess up the testing either. Anyway, I think this is the correct syntax? Can you check? module-setup.sh.inc if [[ -d /lfs3 ]] ; then # We are on NOAA Jet if ( ! eval module help > /dev/null 2>&1 ) ; then source /apps/lmod/lmod/init/$__ms_shell fi module purge elif [[ -d /scratch1 && ! -d /scratch ]] ; then # We are on NOAA Hera if ( ! eval module help > /dev/null 2>&1 ) ; then source /apps/lmod/lmod/init/$__ms_shell fi module purge elif [[ -d /scratch3 && -d /scratch ]] ; then # We are on NOAA Theia if ( ! eval module help > /dev/null 2>&1 ) ; then source /apps/lmod/lmod/init/$__ms_shell fi module purge ... module-setup.csh.inc if ( { test -d /lfs3 } ) then # We are on NOAA Jet if ( ! { module help >& /dev/null } ) then source /apps/lmod/lmod/init/$__ms_shell endif module purge else if ( { test -d /scratch1 -a ! -d /scratch } ) then # We are on NOAA Hera if ( ! { module help >& /dev/null } ) then source /apps/lmod/lmod/init/$__ms_shell endif module purge else if ( { test -d /scratch3 -a -d /scratch } ) then # We are on NOAA Theia if ( ! { module help >& /dev/null } ) then source /apps/lmod/lmod/init/$__ms_shell endif module purge — You are receiving this because you commented. Reply to this email directly, view it on GitHub, or mute the thread. [ { "@context": "http://schema.org", "@type": "EmailMessage", "potentialAction": { "@type": "ViewAction", "target": "#7?email_source=notifications\u0026email_token=AI63FMSRBGJURQLHS7ZHEDLQIZT6DA5CNFSM4IUWBIJKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOD6IA33I#issuecomment-529534445", "url": "#7?email_source=notifications\u0026email_token=AI63FMSRBGJURQLHS7ZHEDLQIZT6DA5CNFSM4IUWBIJKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOD6IA33I#issuecomment-529534445", "name": "View Pull Request" }, "description": "View this Pull Request on GitHub", "publisher": { "@type": "Organization", "name": "GitHub", "url": "https://github.com" } } ]

…

-- Ratko Vasic Meteorologist 301-683-3814 National Oceanic and Atmospheric Administration NCEP/EMC, Room 2791 NCWCP W/NP2 5830 University Research Court College Park, MD 20740-3818

commit c9d7d00 Merge: 57d5044 02f3319 Author: Dom Heinzeller <dom.heinzeller@icloud.com> Date: Sun Sep 8 20:32:11 2019 -0600 Merge pull request NCAR#8 from climbfuji/gmtb_develop_monster_merge_20190904 Merge gsd/develop, restore GNU portability commit 02f3319 Merge: abe9efb d1be445 Author: Dom Heinzeller <dom.heinzeller@noaa.gov> Date: Wed Sep 4 09:04:52 2019 -0600 Merge branch 'gsd/develop' of https://github.com/NCAR/NEMS into gmtb_develop_update_from_master_20190830 commit abe9efb Author: Dom Heinzeller <dom.heinzeller@noaa.gov> Date: Tue Sep 3 16:25:12 2019 -0600 src/module_MEDIATOR.F90: fix invalid Fortran code for GNU compiler commit 57d5044 Merge: 71a4c82 2327dae Author: Dom Heinzeller <dom.heinzeller@icloud.com> Date: Tue Sep 3 09:20:02 2019 -0600 Merge pull request NCAR#7 from climbfuji/gmtb_develop_update_from_master_20190830 gmtb/develop: update from master 2019/08/30 commit 2327dae Author: Ratko Vasic <ratko.vasic@noaa.gov> Date: Fri Aug 30 19:16:52 2019 +0000 Posrt 2 hera commit e638b7e Author: Raffaele Montuoro <raffaele.montuoro@noaa.gov> Date: Thu Aug 22 20:42:22 2019 +0000 Add standard name to NUOPC Field Dictionary defining instantaneous specific humidity tendency due to convection. commit c3ec2c4 Author: Gerhard Theurich <gerhard.j.theurich@noaa.gov> Date: Wed Aug 21 23:26:44 2019 +0000 Support the official NUOPC Verbosity strings "off", "low", "high", "max" for compliance. commit 71a4c82 Merge: fd81084 89ddf13 Author: Dom Heinzeller <dom.heinzeller@icloud.com> Date: Fri Aug 30 07:39:05 2019 -0600 Merge pull request NCAR#3 from climbfuji/bugfix_nemscompsetrun Bugfix for NemsCompset detection of Theia/Hera commit fd81084 Merge: 283eeb1 053bd17 Author: Dom Heinzeller <dom.heinzeller@icloud.com> Date: Thu Aug 29 15:35:33 2019 -0600 Merge pull request NCAR#4 from grantfirl/gmtb/develop add Julie as codeowner commit 053bd17 Author: Grant Firl <grantf@ucar.edu> Date: Thu Aug 29 15:26:22 2019 -0600 add Julie as codeowner commit 89ddf13 Author: Dom Heinzeller <dom.heinzeller@noaa.gov> Date: Wed Aug 28 13:36:52 2019 -0600 src/incmake/env/rdhpcs/detect.mk: bugfix for NEMSCompsetRun commit 283eeb1 Merge: 1c71222 e142f4e Author: Dom Heinzeller <dom.heinzeller@icloud.com> Date: Tue Aug 27 15:45:57 2019 -0600 Merge pull request NCAR#2 from climbfuji/hera_update_20190827 gmtb/develop: update hera config commit e142f4e Author: Dom Heinzeller <dom.heinzeller@noaa.gov> Date: Tue Aug 27 15:04:16 2019 -0600 src/incmake/env/rdhpcs/detect.mk: test for hostname prefix, since hera and theia both have /scratch1 through /scratch4 mounted commit 028e1e8 Author: Dom Heinzeller <dom.heinzeller@noaa.gov> Date: Tue Aug 27 13:45:29 2019 -0600 Update src/incmake/env/rdhpcs/detect.mk, src/conf/module-setup.csh.inc, src/conf/module-setup.sh.inc after move from Juno test system to Hera. Since /scratch4 from theia is also mounted on hera, need to switch the order of detection. commit 1c71222 Merge: 6bf8109 5b244ab Author: Dom Heinzeller <dom.heinzeller@icloud.com> Date: Sat Aug 17 16:25:57 2019 -0600 Merge pull request NCAR#1 from climbfuji/hera_support Add support for hera/juno (theia successor) commit 5b244ab Author: Dom Heinzeller <dom.heinzeller@noaa.gov> Date: Fri Aug 16 09:33:34 2019 -0600 Add support for hera/juno (theia successor) commit d1be445 Author: Laurie Carson <carson@ucar.edu> Date: Fri Aug 16 09:01:15 2019 -0600 Add CODEOWNERS for NCAR fork of NEMS repository commit 766e0cd Author: Laurie Carson <carson@ucar.edu> Date: Fri Aug 16 09:00:10 2019 -0600 Add CODEOWNERS for NCAR fork of NEMS repository commit 6bf8109 Author: Laurie Carson <carson@ucar.edu> Date: Fri Aug 16 08:59:16 2019 -0600 Add CODEOWNERS for NCAR fork of NEMS repository

climbfuji · 2019-09-09T15:43:05Z

You are right, we don't need to change anything... they are both sourcing same filename at same location. Anyway I'm pretty sure your syntax is correct :-) So, your choice.. either use this new syntax, or leave files as they are (eventually changing comment from Theia to Hera). I vote for first option. -Ratko On 9/9/2019 11:31 AM, Dom Heinzeller wrote: Sure - do we need those two scripts at all? You didn't make any changes in them, and my versions apparently don't mess up the testing either. Anyway, I think this is the correct syntax? Can you check? module-setup.sh.inc if [[ -d /lfs3 ]] ; then # We are on NOAA Jet if ( ! eval module help > /dev/null 2>&1 ) ; then source /apps/lmod/lmod/init/$__ms_shell fi module purge elif [[ -d /scratch1 && ! -d /scratch ]] ; then # We are on NOAA Hera if ( ! eval module help > /dev/null 2>&1 ) ; then source /apps/lmod/lmod/init/$__ms_shell fi module purge elif [[ -d /scratch3 && -d /scratch ]] ; then # We are on NOAA Theia if ( ! eval module help > /dev/null 2>&1 ) ; then source /apps/lmod/lmod/init/$__ms_shell fi module purge ... module-setup.csh.inc if ( { test -d /lfs3 } ) then # We are on NOAA Jet if ( ! { module help >& /dev/null } ) then source /apps/lmod/lmod/init/$__ms_shell endif module purge else if ( { test -d /scratch1 -a ! -d /scratch } ) then # We are on NOAA Hera if ( ! { module help >& /dev/null } ) then source /apps/lmod/lmod/init/$__ms_shell endif module purge else if ( { test -d /scratch3 -a -d /scratch } ) then # We are on NOAA Theia if ( ! { module help >& /dev/null } ) then source /apps/lmod/lmod/init/$__ms_shell endif module purge — You are receiving this because you commented. Reply to this email directly, view it on GitHub, or mute the thread. [ { "@context": "http://schema.org", "@type": "EmailMessage", "potentialAction": { "@type": "ViewAction", "target": "#7?email_source=notifications\u0026email_token=AI63FMSRBGJURQLHS7ZHEDLQIZT6DA5CNFSM4IUWBIJKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOD6IA33I#issuecomment-529534445", "url": "#7?email_source=notifications\u0026email_token=AI63FMSRBGJURQLHS7ZHEDLQIZT6DA5CNFSM4IUWBIJKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOD6IA33I#issuecomment-529534445", "name": "View Pull Request" }, "description": "View this Pull Request on GitHub", "publisher": { "@type": "Organization", "name": "GitHub", "url": "https://github.com" } } ]
…

I agree, let's go for option 1. I tested the new syntax by creating two small shell scripts, one for csh and one for sh, ran them on both theia and hera and got the correct results. I pushed the changes to my branch and the PR should be updated by now.

conv_gefs2datm : Convert input data from GEFS to DATM

This was referenced Sep 9, 2019

master: update from gmtb develop 2019/09/09 NCAR/ccpp-physics#317

Merged

master: update from gmtb develop 2019/09/09 NCAR/ccpp-framework#222

Merged

This commit #refs 66173 (merge gmtb/develop into NOAA-EMC/dev/emc) NOAA-EMC/GFDL_atmos_cubed_sphere#3

Closed

climbfuji marked this pull request as ready for review September 9, 2019 03:37

RatkoVasic-NOAA requested changes Sep 9, 2019

View reviewed changes

climbfuji force-pushed the emc_reference_update_from_gmtb_develop_20190909 branch from 72378d6 to 8989e81 Compare September 9, 2019 15:41

RatkoVasic-NOAA merged commit 33b414a into NOAA-EMC:develop Sep 9, 2019

climbfuji mentioned this pull request Sep 13, 2019

Fixing a runtime error for GNU compiler on Cheyenne #8

Closed

hyunchul386 added a commit to hyunchul386/NEMS that referenced this pull request Jul 24, 2020

Feature/hera_preprocess_gefs (NOAA-EMC#7)

e956923

conv_gefs2datm : Convert input data from GEFS to DATM

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

This commit #refs 67538 (merge gmtb/develop into NOAA-EMC/develop)#7

This commit #refs 67538 (merge gmtb/develop into NOAA-EMC/develop)#7
RatkoVasic-NOAA merged 1 commit into
NOAA-EMC:developfrom
climbfuji:emc_reference_update_from_gmtb_develop_20190909

climbfuji commented Sep 9, 2019 •

edited

Loading

Uh oh!

climbfuji commented Sep 9, 2019

Uh oh!

RatkoVasic-NOAA left a comment

Uh oh!

climbfuji commented Sep 9, 2019

Uh oh!

RatkoVasic-NOAA commented Sep 9, 2019 via email

Uh oh!

climbfuji commented Sep 9, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

climbfuji commented Sep 9, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

climbfuji commented Sep 9, 2019

Uh oh!

RatkoVasic-NOAA left a comment

Choose a reason for hiding this comment

Uh oh!

climbfuji commented Sep 9, 2019

Uh oh!

RatkoVasic-NOAA commented Sep 9, 2019 via email

Uh oh!

climbfuji commented Sep 9, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

climbfuji commented Sep 9, 2019 •

edited

Loading